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

Bug: 205056467
Merged-In: I429fc56ad989b6baa87448dd2c148a84d31551b9
Change-Id: I5d832993fcd8f5e2b678d0802ca0f33747ae5e07