[automerger skipped] Better support for handover from OOS am: d4f1e7b1 -s ours

am skip reason: Merged-In I5e720dad4486d893d561b461c08da9da728421dd with SHA-1 f60de4d5 is already in history

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



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