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

Bug: 205056467
Merged-In: Ibd8fc18966d7f4b827321c2cc33bae9a3d314f8d
Change-Id: I08b4819819cd4b766abca4090598601bae6feffe