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

Bug: 172690556
Merged-In: I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4
Change-Id: I2e739d3606ba9f0938ebc2363cb9443ec3dec912