Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs."