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

Bug: 264720040
Merged-In: If63bf6baf07c529d933549d535a854c21d664c9d
Change-Id: I51d4a269cd5c9aa18c88c16440ea4e04e0e47999