Merge "Add simActivationState to PhoneStateListener"