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

Bug: 172690556
Merged-In: I9a88297d7202a288a4db34775f56303b5b939de4
Change-Id: Ibbd41ce6322ddd10b44ca4bd3afc2dddfc085552