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

[automerger skipped] Merge "Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup." into udc-dev am: aaf2965c -s ours am: edc20eb8 -s ours am: 6879c6b2 -s ours

am skip reason: Merged-In I0aaa0f7f57b8dd137403b6ceb7068e7c99652e1f with SHA-1 d7b0534a is already in history

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



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