Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3da6 am: e2b1c7c0c3

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

Change-Id: I3949421a6e9de16d736e4a70d74ca5e5fdce2ec9