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

Bug: 172690556
Merged-In: I7e17db74447a28b9775a973bf704ff693822b2de
Change-Id: Ic03af257e21da3ac353fcc8ea1c9e8d428871acb