Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs."
am: 5b2a6e959a

Change-Id: I70198681ed2e073ebcae9f9e00d33108be480d8c