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

Bug: 172690556
Merged-In: I7509b5d196ca241b2d80fcd801b7af94b749fb70
Change-Id: Ia0b1c53b5b58c067e86805a34e358081831dc792