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

Bug: 264720040
Merged-In: I67cd2b5177e611f9dca8a7aa901eb0792d0bedc9
Change-Id: I01fa9384aa36fba5d10de8325db2499b50f5415f