Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de am: c0ea72cf am: f72d5dbb Change-Id: I8a7f28feb66265be2379beda7bc3fce732e4a294