Merge "Fix mis-ordered merge in PhoneStateListener.java"