Merge "Add simActivationState to PhoneStateListener"
am: 132842efc9

Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a