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

Change-Id: I8052029dea2c2f767d4787e6218fd7894e15689f