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

Bug: 172690556
Merged-In: Iae35596629c0a396e24a9877c2c4e99322c4b495
Change-Id: I84b3f43dd187e541a0b93698b92cc46be37bc755