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

Bug: 264720040
Merged-In: I3fe09a99e475637759f8ee1441dacfc30afa56d7
Change-Id: I99447842110572a50235ef13823965fd5dc1d99c