[automerger skipped] Merge "Adding getSimApplicationState & getSimSlotMapping"...

[automerger skipped] Merge "Adding getSimApplicationState & getSimSlotMapping" am: b96f60f5 am: ef94bfc6 am: dfd034ba -s ours

am skip reason: Merged-In I40ec6c8083d9e8718a300b119ceb089648b8dea4 with SHA-1 1fb2b00c is already in history

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

Change-Id: Ic0095188855e2fea8069a7f8006f1dfc529fbb3f