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

Bug: 264720040
Merged-In: I56b0eaaaa7a0eb998c0feb0859983dd6c5ddfc1b
Change-Id: I4147f6c20ffd29c6c86dc4b926a8fe60bc49d304