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

Bug: 264720040
Merged-In: I262a862810faaa4668a8bd961c34b479507b10fc
Change-Id: Ic7d2c5a949e8f18ad4c4221ea2a76d9c973fc0ed