Merge "Update AndroidKeyStoreMaintenance framework API"