Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87 am: c0ea72cf10
am: f72d5dbbf1

Change-Id: I8a7f28feb66265be2379beda7bc3fce732e4a294