[automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours am: 0ca0eefe9b -s ours am: 4c7844f103 -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: Ie8bbad14db36f7a38dd9e22659b8d68687fcbe0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>