Merge "Update TelephonyDisplayInfo on preferred network type changed" into rvc-dev am: 2353e47b am: 077772de am: 02eabfdb am: f8149022

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

Change-Id: Ic76535983a35d31374e599f005ce0577865ee813