Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571

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

Change-Id: I80b9a9a9f84466c49e4dfe80d14cd302fcc7f4e3