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

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

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



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