Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I56abeae5adec79a1c7bdad1a261f0f62c055cf2e
Change-Id: I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa