Merge "Renamed DisplayInfo to TelephonyDisplayInfo"