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

Bug: 172690556
Merged-In: Ie014e1bca8c134a38fd161a6fa263386b8528cb1
Change-Id: Icc69137c6d2e5118096a4f3661273d96952a18c6