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

Bug: 248070379
Merged-In: Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2
Change-Id: Ie94baaca2f1f365ed4768a763929d12418fcaff3