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

Bug: 264720040
Merged-In: Iab4145a18c9d216689d68b83adf747ec4f229ade
Change-Id: Ic44b43422c69813cb6c1aea52056b30bd108edfb