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

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



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