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

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



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