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

Bug: 264720040
Merged-In: Idb4dcb74faf9ff131b6f77e27c9a1ee7ee80f52c
Change-Id: I5f706ede6709eba9c74a71257a90f75f6966ac3c