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

Bug: 172690556
Merged-In: I3ba99b0a408587d10abc81089d485cad4cde0853
Change-Id: Ie6f2921bc2a9707b79cc29254f4ba4b6d9841da1