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

Bug: 264720040
Merged-In: I75ef387d8a3b8da1239b8ca39372a75a77435acd
Change-Id: Ie4834ea71e62cbf53da19b9b017ba4e8b957f8c2