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

Bug: 264720040
Merged-In: I6d9f142e46ba25dc4e19883b593a0f7349a61ecf
Change-Id: Iaad4561ed0fec38a1e3f9b855ca356ed2c46b068