Merge "Fix doc of NETWORK_TYPE_NR & add converter"
am: 1abe6aa53f

Change-Id: I60d839b62e9b9365df48c72b040f1f5b2e7b011c