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

Change-Id: I05a42ca0faee0508ba50d73abcd3e3cb87cd6580