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

[automerger skipped] Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup. am: d7b0534a am: 8cdfb546 -s ours

am skip reason: skipped by grantmenke

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



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