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

Bug: 172690556
Merged-In: I72658443fde61aa5f10463fcc42772daf4143ed0
Change-Id: Ifb9605a1f9407357ddc755551e2d1d51c7f09bfc