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

Bug: 172690556
Merged-In: I3c472c1178a6c68f524785a5362524ede1d7a158
Change-Id: I831ca4a17b75e84674d2cf7443d6e3f4d64c59c4