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

Change-Id: If79bf6eff63fe2ca430a73835388e441bebbbb7f