[automerger skipped] Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." am: 725c54065d am: 3a6b29da40 am: cb5b958917 -s ours
am skip reason: Change-Id Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a with SHA-1 145294168f is in history

Change-Id: I2a3e0092171dc7dc7aaecf2e9cc9aa4ef52b15b3