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

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



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