[automerger skipped] Merge "Add auto data switch feature" am: 6dc71cd4 am:...

[automerger skipped] Merge "Add auto data switch feature" am: 6dc71cd4 am: 0e5dce52 am: aac04a51 -s ours am: c2f7a134 -s ours

am skip reason: Merged-In I0aa793d73f88de022944566d34f889b894f3b24f with SHA-1 8abebce0 is already in history

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



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