[automerger skipped] Merge "Add API for setting SIM power "synchronously"" am:...

[automerger skipped] Merge "Add API for setting SIM power "synchronously"" am: beb163c6 am: 5a9aa7c8 am: bccf3aa3 -s ours

am skip reason: Change-Id I958d6c3a46cc6e99e8addf2628361e37bc178464 with SHA-1 9a081450 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94877a636d877c05f8798a8ae6d2e57cf06b07a2