Merge "Merge "Fix timer bug in TrustManagerService." into udc-dev am:...

Merge "Merge "Fix timer bug in TrustManagerService." into udc-dev am: 326dd9c1" into udc-dev-plus-aosp am: c26ac495 am: 882bc947 am: 6e2cd072

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



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