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

Bug: 264720040
Merged-In: I3461c9e33b64e7d44bb3b430c8eb00d794669037
Change-Id: Ib3a534f3ba28669e8d3ce57f616f8c0b0e874f4a