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

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



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