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

Bug: 172690556
Merged-In: Ia4f466adbc33438322fb4703d450c0270eceb8e9
Change-Id: Idfeb0ac6f37563db8a7921e7d03dcaf0502183f6