Merge "[automerger skipped] Merge "[Provider Model] Add cutout for signal icon...
Merge "[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: 9c48278b -s ours" into sc-v2-dev-plus-aosp