Empty merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: Ib9d09f586af89dfb041451b5faf7003e287757f7
Change-Id: I2d8ac14aff1f85492c416695c9e767b8060fdd74