Merge "Fix mis-ordered merge in PhoneStateListener.java" am: a97bdb957f
am: d57e403dd0

Change-Id: I7759d933eae873879a5e3677397baebd1c356747