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

Bug: 172690556
Merged-In: I83a1495542a226ed6114259e8f4fa78ef7bd3423
Change-Id: I84e48c9b3aae786b2952eab49ca60194820310ab