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

Merge "Merge "Fix timer bug in TrustManagerService." into udc-dev am: 326dd9c1 am: 53065e57 am: 362b0637" into udc-qpr-dev-plus-aosp am: 5a30df13

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



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