Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec5a am: 2172f58763 am: 49e95446fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id87860c4d3741a78a5b7aa8bb67931e5c8581e59