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

Bug: 172690556
Merged-In: Icfc855bf9993c0e639e6484aa31d174e6b702c4c
Change-Id: Idddda38e3277fe33216d1de782bcfe43cebc5bfb