[automerger skipped] Merge "Gracefully handle ENABLE_UICC_APPLICATIONS...

[automerger skipped] Merge "Gracefully handle ENABLE_UICC_APPLICATIONS failure." am: 5ad93af7 am: a22c7ce1 -s ours am: 3c126036 -s ours am: c50fb80e -s ours am: e1f25872 -s ours

am skip reason: Change-Id Id0ab0bffb0aca904cee99dff8a7f7d521329282c with SHA-1 5a17f851 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1324702

Change-Id: I2379c68e2335d58226d94e2f12e3b2102b876c8e