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

Bug: 172690556
Merged-In: Ieb581e35361327e29f5ffd4ea71abeb51f1e27b2
Change-Id: Icae620a6b4def01269a0d9ec16938e8dd425ac7a