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

Bug: 264720040
Merged-In: Ic6ebbeef9109f7f5298846f13780b54e97c9503f
Change-Id: I03121534906305bac91a67dbfeb55083d3dc64fe