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

Bug: 172690556
Merged-In: I62dd37dbbe959f869225f57dda0504fd31546e53
Change-Id: I9cd544292abc85430a234bede371e4f4010848b6