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

Bug: 172690556
Merged-In: I785e80c0e4d41ae65a155a0564873aef82d4b056
Change-Id: I4fa81471cfbb324943a7dd67b1987d7c68bc7dce