Merge tm-qpr-dev-plus-aosp-without-vendor@9129937

Bug: 248070379
Merged-In: Ie8c226d9e7d1d0dc481d026ccd454a1db46fb915
Change-Id: I8206955fb2c4a5a70cd15f13cefe6c5940dcc124