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

Bug: 172690556
Merged-In: I7d44dd53cd0f77438d948b966b5de2c32f3347e8
Change-Id: Id2dae5622864032c8734ddccfc455a7aa7174c69