[automerger skipped] Merge changes from topics "enterprise_internet",...

[automerger skipped] Merge changes from topics "enterprise_internet", "isDataAllow", "set_data_enabled" am: e8a82323 am: 56cd0781 -s ours am: 4ac836ce -s ours am: 10d50e87 -s ours

am skip reason: Merged-In Ibb509903322cb0f3f53a0c17ab71136dc1b95d60 with SHA-1 e4c596bd is already in history

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



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