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

Bug: 172690556
Merged-In: I4fe927a0bdfa1730b5f758c5e92be6b907a2fad4
Change-Id: I14a401734be73f89a3b929dc3c0c5dc1742766c0