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

Bug: 172690556
Merged-In: Ibabd0304187cc4d365ddf08858dd673e05a3806a
Change-Id: Ic26220d8b715ab7204cedd350dc26362f1f709f0