Merge "Revert "Update AndroidKeyStoreMaintenance framework API""