[automerger skipped] Merge "Adding getSimApplicationState & getSimSlotMapping" am: b96f60f5c3 am: ef94bfc623 am: dfd034ba5d -s ours am: 10cb4386c3 -s ours
am skip reason: Merged-In I40ec6c8083d9e8718a300b119ceb089648b8dea4 with SHA-1 1fb2b00c3a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936438
Change-Id: Ie0a766a868ef9dd785611947f0d7f0a4fbf140bb
This commit is contained in: