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

Bug: 172690556
Merged-In: I40cfe81c9f4550afd79d20772cdb685edae39b73
Change-Id: I79c17a165e676cd6a135dd27241e9ca4a05fd7c8