Merge "Add Executor Support for PhoneStateListener"