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

Bug: 172690556
Merged-In: I1ccde569e04939c5d9f082cf058c0d6255f0842a
Change-Id: I55c1e41284c66ea3ee9ea53ea1eab878bb48148f