[automerger skipped] Merge "Add handling of permanent disabled sims" into udc-dev am: 9028f28e -s ours am: f7b0375d -s ours am: 68e0501a -s ours am: d243f86e -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: I5a6f6da1f661c5bbb5ceed1429583eb30dd703e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>