Merge changes from topic "sm_cleanup" am: b3832a47

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



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