[automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the...

[automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a5 am: 8c799744 -s ours

am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689

Change-Id: I069905bbf4d459eddb22c845bbb8f4a766e00a7f