Merge "Fix typo for permission BIND_TELEPHONY_NETWORK_SERVICE" am: 60f678bd6f am: d7e3f429e2 am: 4c4c10511d

Change-Id: I6966685d787f0c243132c93d1379caf14cb02fb6