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

Bug: 172690556
Merged-In: Ieecf31deb3e189bf3a1042a3ae923950a642d274
Change-Id: Id3376ea751ce8be9a8b4d0ebe49b6698a0638dfd