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

Bug: 172690556
Merged-In: I2fed8c65faefcd0d1eff7f829e2d23bf20035b51
Change-Id: I709657f2c365a07311485adde9306d4a9508be00