[automerger skipped] Merge "Update CardState HAL and make setSimPower...

[automerger skipped] Merge "Update CardState HAL and make setSimPower synchronous" am: db43f192 am: fec6bfda -s ours

am skip reason: Change-Id I0d298209a00f5f194547b0d6e368baa44b0c18ec with SHA-1 da8cd066 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1470181

Change-Id: Id62f01e2307b28be59f2c31d488d83004aa9c660