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

Bug: 172690556
Merged-In: I527097ba19414c3ed99606f95276ff506cfb4ec2
Change-Id: If031ceec4c449b2dd5a7f6516fa5faa3d880b144