Merge changes from topics "srvcc", "unmetered_configs" am: 15d84436

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



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