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

Bug: 205056467
Merged-In: Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e
Change-Id: Ic9b9344401235f2b056a7fdd0ac97f8ee1666e07