Merge changes from topic "sm_cleanup" am: b3832a47 am: 1e45879b am: ef2008d4

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



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