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

Bug: 172690556
Merged-In: I333bab1743b0c2920dcab1cd0e9904c5dab9aa80
Change-Id: Ibf39090d2a23f6a7b9e4bd9c2e491197d060e40e