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

Bug: 264720040
Merged-In: Ic7e102201196285cba18e12e27c7cd4d40dcc8e4
Change-Id: I30e8cb0ea98eff82f69fa11d4dce6488cf99962c