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

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

Change-Id: I137ba1020452cd91b047b81d8a1a8baecdcd68f6