Merge "Fixed UserManagerService.evictCredentialEncryptionKey()" into udc-dev am: 5869befb am: a2039382 am: 1d576e5c

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



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