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

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