[automerger skipped] Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: 9730907778 -s ours am: b91922a9a4 -s ours am: a9f4667234 -s ours am: d2e8ce9e8b -s ours am: 92f5b71cb9 -s ours

am skip reason: skipped by grantmenke

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

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