Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: I72c3175fe3dce0800051d854928a1227d6f5c225