Merge "Update CardState HAL and make setSimPower synchronous" am: db43f1926e

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

Change-Id: Iff90cf16137a4cd0acdc6774b8b939232899cdfd