Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: Id32f8aaeafb27c13da66f7da280d4940c1266e39
Change-Id: I9506244b1c224a47c09596185cd1aad8245ccb64