Merge "Update TelephonyDisplayInfo on preferred network type changed" into rvc-dev am: 2353e47b am: 077772de am: 260d3cc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11853113

Change-Id: Iaa633ad5d4c6f74974bf044476da606a2db59497