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

Bug: 205056467
Merged-In: I4ff1d8f4e81a3dd887954001d030b31cb5c7d642
Change-Id: If8e12e89f16cdbc8d4ffb7def51f7c2fc587e907