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

Bug: 172690556
Merged-In: I8411fd98483be80de21a49c8e23d1d621db21d06
Change-Id: I98cc04d82b9b4f971b15a170ef17d580ba524b40