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

Bug: 172690556
Merged-In: I5f04c18ba85786a4e511a90bb6f2e4fc55a52076
Change-Id: Ie4ce393c5e5632af604d80d0536a3aeacc76076a