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

Bug: 248070379
Merged-In: I15becc3306b5123144c39034bd064d68e520b056
Change-Id: I381fecef4d889daf865dd9a36e349044d25fd000