Merge changes from topics "handover_in_progress", "voice_rat_switch_count"...

Merge changes from topics "handover_in_progress", "voice_rat_switch_count" into udc-qpr-dev am: 9431a8b5 am: 2594c8e8

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



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