[automerger skipped] Merge "Better support for handover from OOS" into...

[automerger skipped] Merge "Better support for handover from OOS" into tm-d1-dev-plus-aosp am: ed467c2d -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: I5f8892f9d8c11faa17612031cfcbb28064014c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>