[automerger skipped] Merge "[Settings] subscription UI should be closed when...

[automerger skipped] Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585 am: 5dba10a9 am: 5975853b am: 0f2bc3ba am: e68a8c49 -s ours

am skip reason: Change-Id I2854147c956faa633a9682eee0028db6cd2d3912 with SHA-1 95b129c8 is in history

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

Change-Id: I4e9b95fd36178898037f191c71e1fa8ebae5e163