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

Bug: 172690556
Merged-In: Ib7af1dc437feb7676e2c9ebe81075bc9e93f0eb9
Change-Id: I1325e88711b3e467279ebcc168ddb20525b0388a