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

Bug: 172690556
Merged-In: I2b488741827d03bbb4ff21de562ebaf9e80656be
Change-Id: Iedbb563e569af1127e34822a5f3fa8457947a179