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

Bug: 172690556
Merged-In: I691254d108008b99ee1a6a2bc00ee963270cff8a
Change-Id: Iacf6381bbe4781a8ce215647e7df401941424bda