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

Bug: 172690556
Merged-In: Ie846e15f6e11a143a030f2a2c8df4a90e33affb6
Change-Id: I96e0bd9743911ea4c8d29ab6306441f4e03ed809