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

Bug: 248070379
Merged-In: Ie61f2488a0bad23807f84cb55fcdcb2aae407191
Change-Id: Ia265376d6d729c261518baa162dccd5e4ffdd5e2