[automerger skipped] Merge "Add handling of permanent disabled sims" into...

[automerger skipped] Merge "Add handling of permanent disabled sims" into udc-dev am: 9028f28e am: 9e361db2 -s ours am: 56c7b440 -s ours

am skip reason: Merged-In I01c46cd868abd3e91fa37d80f5b75aec4b9f0014 with SHA-1 4968b408 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23663149



Change-Id: I9a18eeaf5fb94ed83fa39d28cc7a071a40b09802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>