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

Bug: 172690556
Merged-In: Ic6f3892877dcd01a67b155aa59967b56f98132f6
Change-Id: Icddee3bd2b5465dd80572f09ca1e1125ed058aab