Merge "Unhide Network types in TelephonyManager" into nyc-mr1-dev