[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 -s ours am: 1c0b3b0a -s ours am: 02e50b1c -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: If63616b8ec35fdf16b7ccfa7d7c88c96ba06a138