[automerger skipped] DO NOT MERGE ANYWHERE Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: 5d69142008 -s ours am: 01cab5b1b8 -s ours am: 686db6ccd3 -s ours am: f5794a3695 -s ours

am skip reason: contains skip directive

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

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