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

Bug: 172690556
Merged-In: I96a3d1f8141d6c0627364b53dfdf302e406f283e
Change-Id: I7ac53c980f2451658529ec026f43be8fa9eec11c