[automerger skipped] Merge "Extend HandoverRule with ApnType" am: 1064e2fb...

[automerger skipped] Merge "Extend HandoverRule with ApnType" am: 1064e2fb am: faeb8267 am: 500caf66 -s ours

am skip reason: Merged-In Idaf2b7f7d2b7498130f18e4201839ae5f937a5bd with SHA-1 e6bf76f9 is already in history

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



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