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

Change-Id: Ie081fa88a754fe79fa6466781d8c88a53e8452b6