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

Bug: 205056467
Merged-In: I0f22bb6e4c1f1d48375844861881ad139d6646aa
Change-Id: I8be098532297ecb1e9ab430a57ab10c545d1c06b