[automerger skipped] DO NOT MERGE Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: 29ddf7af -s ours am: 386afebf -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/31747512



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