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

Bug: 264720040
Merged-In: Ia56e92ed5358ca66185f5011abd139392ee73785
Change-Id: I05e049a4100f0d393c876c95dff5efda4d6f157a