Merge "Merge "Merge "Merge "Fix timer bug in TrustManagerService." into...

Merge "Merge "Merge "Merge "Fix timer bug in TrustManagerService." into udc-dev am: 326dd9c1" into udc-dev-plus-aosp am: c26ac495" into udc-d1-dev-plus-aosp am: c7123715" into udc-qpr-dev-plus-aosp am: 198dbe00

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



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