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