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

Bug: 172690556
Merged-In: If48148a7dd4591eb5ea04c914b071a9e08911f21
Change-Id: I354471b5d45416b1ec11e8d4db11d945d0b79e74