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

Bug: 205056467
Merged-In: I352ad056f3ec7495596de628d0e81492ff7c02a7
Change-Id: I1ff21b9a866227b1e2c57ebf568751b8d9ec3df9