Merge "Add Executor Support for PhoneStateListener" am: 7fe6f36f16
am: cda6f2b422

Change-Id: I18e9592b3d6ea165be83c4468f624c166086193d