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

Bug: 205056467
Merged-In: Id5f7de88e6ef85834a6003e99fa6c9f2a45b6531
Change-Id: Ic76878a8f40cb5ddb2821f7ea046d52f199d4b37