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

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

Change-Id: Iddeb472553b4713fc51613effa6e565188119bf8