Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3da6 am: e2b1c7c0c3 am: 9059a92d16 am: 91eb3c269b am: 9a48be209f

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

Change-Id: I2bec327f5f5d15a711baf69c88be87421ce51b2e