Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test"