[automerger skipped] Merge "Avoid AllowedNetworkTypesListener...

[automerger skipped] Merge "Avoid AllowedNetworkTypesListener NullPointerException." am: ff7cbeff am: f0ff1c45 am: 4d7dd6a1 -s ours am: cf8de048 -s ours

am skip reason: Change-Id Ia43f0117a2e1e573730554d878e9ce4cf9acad91 with SHA-1 7ae2ec0f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a8fdc494b0f2cf262aa70947bfd88137c5c89a2