Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I785cb7bcb13650033fc617140e188a334b58da8b
Change-Id: I8959b690d57130760e14df4941f2b206f5adf4ee