[automerger skipped] Ensure ScheduledExecutor is not shutdown before...

[automerger skipped] Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: 97309077 -s ours am: 6b836dfd -s ours

am skip reason: skipped by grantmenke

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



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