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

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

Change-Id: I166f4a8a6dbc1fe31f08e7a2424e2cabd1d84a03