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

Bug: 172690556
Merged-In: Idad7abb855c935afd22c40813b07aae5f449f5f2
Change-Id: I61c1d633182140154e82f4439bf9b384cbbf11bb