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

Bug: 248070379
Merged-In: I0634a7cf0c05e69f66c882158eb5f3fd1431bb7e
Change-Id: I4877b03334fc28c8bf902822da22dd6fcef8f5e9