Merge "Fix typo for permission BIND_TELEPHONY_NETWORK_SERVICE"