[automerger skipped] DO NOT MERGE Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: 89fa2bad -s ours

am skip reason: contains skip directive

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



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