[automerger skipped] Initialized allowed network types am: 24856630 am:...

[automerger skipped] Initialized allowed network types am: 24856630 am: a6cda048 -s ours am: 02239f5d -s ours am: adf72dc1 -s ours

am skip reason: Merged-In I23db0581dc0ab1663648d6b2b68895dfc9d18be7 with SHA-1 aa4889d0 is already in history

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



Change-Id: I94914ebf71cd9ea4ff1aec37a16905e803470d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>