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

Bug: 205056467
Merged-In: I3743cb633403f036951cc5560c43c9f1d9a0c682
Change-Id: I686db545c09dbe099da007281bc2ae700d098325