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

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

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



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