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

Bug: 172690556
Merged-In: If983d76caf3583866552b5e7a63c03431f67eb42
Change-Id: Id81e568e8c3f04dfd9f4f01348c75fa47471be1e