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

Bug: 264720040
Merged-In: I732861692946d1aa6bef2c6798f00c98d52ed6d6
Change-Id: I6192695db7690938648ddccea148ac22983585c0