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

Bug: 205056467
Merged-In: I80dc1f6cc24e8db463935d235771c9bff9d16f0e
Change-Id: If51677e245b4f8f1ea0bf74083f8bcd7b88ee9fe