Merge changes from topic "unknown_handover" am: 0ad1f820

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



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