Merge "add missing permission check in PhoneStateListener"
am: feb7d14aa8

Change-Id: I7ccfab5789cd2adf654d6d593cec22f496a9a767