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

Bug: 205056467
Merged-In: I9524cbd2193861cc5e8ce0771accf984b0f0d0d8
Change-Id: Icbd6f0aeaf6a8e60a991c8b4d67e65549c6c464d