[automerger skipped] Better support for handover from OOS am: 277075ed -s...

[automerger skipped] Better support for handover from OOS am: 277075ed -s ours am: 22d80885 -s ours am: 61ece289 -s ours

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

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



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