[automerger skipped] Merge changes from topic "sm_cleanup" am: b3832a47 am:...

[automerger skipped] Merge changes from topic "sm_cleanup" am: b3832a47 am: 1e45879b am: ef2008d4 am: 744a0fce am: 2dcea7da -s ours

am skip reason: Merged-In I50c110f53caec4b73708dcf1cb8d52708242d7ea with SHA-1 31309ffa is already in history

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



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