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

Bug: 205056467
Merged-In: I3c2e54dbcdbe3a99017ad31bfc4e76984335b330
Change-Id: Ifded692ddfdfe33e1334bae03f950f5fafea75cf