Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382
am: 60ca278b7f

Change-Id: I13a38eb6094899e396d079e13e07e15d1cb5ca98