[automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours

am skip reason: Merged-In I75d58e09848d4123bb55ea9a36cab739504ca6e8 with SHA-1 c539a470cb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2729595

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