Merge changes from topics "default_sub", "default_vonr" am: ec63139d am: 59f4d4a5

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



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