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

Bug: 172690556
Merged-In: Icbcbce7c8657e6424c3a98f5c4ee388a793122ae
Change-Id: I17602e470cf1600f0321a715dceff543c220b5f0