[automerger skipped] Merge "Update TelephonyDisplayInfo on preferred network...

[automerger skipped] Merge "Update TelephonyDisplayInfo on preferred network type changed" am: a8d6af4e am: 77178f0e -s ours am: 23d65e03 -s ours am: 5ff6962f -s ours

am skip reason: Change-Id Id7f2b276b7886f6b23d7e6724e6a161555fc7dcc with SHA-1 d102c20b is in history

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

Change-Id: If688eda616c0733ad2487fa0310737f4461171bf