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

Bug: 264720040
Merged-In: I59ea99e8a1720f61954747f6c29e14cfea9a0f56
Change-Id: I016e93351fe6ba3e46cff141280ea0b1ebffd37c