[automerger skipped] Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: 9730907778 -s ours am: 6b836dfda8 -s ours am: 9635dfd274 -s ours am: 1c326c8e0a -s ours am: 866db9dfd3 -s ours

am skip reason: skipped by grantmenke

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

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