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

Bug: 172690556
Merged-In: Idd3ecd217229d37bfef5bed50c55cd1a837ce852
Change-Id: I9b4c72aa8dd0f16c7568e846374e3b837d580c8a