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

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

Change-Id: Iaf6508517a2078145f639cd7694a3ffa0cd9e997