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

Bug: 172690556
Merged-In: Icfc08862db6fccd67ccfb60dc390d456ec5387e0
Change-Id: Ie98fb7180de7b10542ba5b9635fb47542a75a956