[automerger skipped] Merge "Adds ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G to...

[automerger skipped] Merge "Adds ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G to Phone.java" am: 1b3b09e8 am: 5d4b2877 am: 4c3be162 -s ours am: 077ac2a2 -s ours

am skip reason: skip tag Change-Id Id73428f038f54392a67684dba3594452f869edc5 with SHA-1 39998d48 is already in history

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

Change-Id: I803410725f4303ee7ca42b2f310931300cc008f4