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

Bug: 264720040
Merged-In: Ibb258b001c75ce34f623ff8bdee638c091b9af7d
Change-Id: I8aded870cef77d4eb5dde8a28101d9a54c75dca6