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

Change-Id: Ic20401236b22b75d1afe38a49e2897473634e99f