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

Bug: 205056467
Merged-In: Ib6c4ea6b8e69604839ada1c58ec10b20a6a77f93
Change-Id: I2b0b83ee7aee731031ebb4f18d476a39bf3e11d5