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

Bug: 172690556
Merged-In: Ib951d1a8f55a514f77d015fec8c3cbc1809760d5
Change-Id: I47caff651827119801e9151b9a4954061f169553