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

Bug: 264720040
Merged-In: Ia9226ddfc6007284fa5d2a7f61c6d24482790e55
Change-Id: I7f9da42651703971d0a91805f8a01098f36eefed