Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 Bug: 248070379 Merged-In: I64e49b2c1569d65798dd95b8bcd123100e90fe23 Change-Id: Iaf7bd72f8dda0e5e0425aa9c31a99a73f8df45ef