Merge changes from topic "am-fddb9f6b1bb3410b8937e76c149bc556" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Add handling of permanent disabled sims" into udc-dev am: 9028f28e -s ours am: f7b0375d -s ours
  [automerger skipped] Add handling of permanent disabled sims am: 28227a3e -s ours am: 9f16b1c5 -s ours