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

Bug: 205056467
Merged-In: Iff22ccbedad44f55d81786148ab95901e739aa76
Change-Id: I3cb26ae20be7946be34f4b3942eb8b73a4f4737f