Merge "KeyChain: annotate with @WorkerThread" into mnc-dev