[automerger skipped] Merge "Don't remove messages in NetworkTypeController"...

[automerger skipped] Merge "Don't remove messages in NetworkTypeController" am: a083ee0b am: 1dced8f4 -s ours

am skip reason: Merged-In If137603499472754fe45f13e350c97c52f0b5a64 with SHA-1 832de359 is already in history

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

Change-Id: I5a55f3919dade6897c989871b3a18ac68623ddfc