[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: 9635dfd2 -s ours am: 1c326c8e -s ours

am skip reason: skipped by grantmenke

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



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