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

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



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