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

Bug: 205056467
Merged-In: Ic77e834691d998b8b16aff987c0603bdf8484b25
Change-Id: I4244b0f45d4e78fb46599e60ee3319380ff91d4b