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

Bug: 172690556
Merged-In: I463ed2e51635573a01d13d90dd437e03d2d9f641
Change-Id: I336f2eca214c611698cc1b536e7ff80c800b397a