Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382 am: 60ca278b7f
am: b4f9ceb912  -s ours

Change-Id: I2064449244f285bd707e18582d1830a286a729b3