Merge "Fix timer bug in TrustManagerService." into udc-dev am: 326dd9c1 am: 53065e57 am: c37166f2

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



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